(x_new_font): Return font object, not fontset. (Bug#119)

Don't block input, as per earlier xterm.c changes.

diff --git a/src/w32term.c b/src/w32term.c
index aab2d0d7473d322cb7974b17ef4e18455e01f118..f771427e5485b2ff9eefe8858882d2502f3e5fdc 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5229,9 +5229,7 @@ x_new_font (f, font_object, fontset)
   if (FRAME_FONT (f) == font)
     /* This font is already set in frame F.  There's nothing more to
        do.  */
-    return fontset_name (fontset);
-
-  BLOCK_INPUT;
+    return font_object;
 
   FRAME_FONT (f) = font;
   FRAME_BASELINE_OFFSET (f) = font->baseline_offset;
@@ -5264,15 +5262,9 @@ x_new_font (f, font_object, fontset)
        x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
     }
 
-#ifdef HAVE_X_I18N
-  if (FRAME_XIC (f)
-      && (FRAME_XIC_STYLE (f) & (XIMPreeditPosition | XIMStatusArea)))
-    xic_set_xfontset (f, SDATA (fontset_ascii (fontset)));
-#endif
-
-  UNBLOCK_INPUT;
+  /* X version sets font of input methods here also.  */
 
-  return fontset_name (fontset);
+  return font_object;
 }
 
 \f